Improve Windows Compatibility(for lib/TH) #2439

peterjc123 · 2017-08-16T02:50:38Z

Win64 support for lib/TH

fmassa

Thanks for the PR!
I did a first pass on it, and had a look on the output of the contribuild. TH compiles, but the compiler outputs some warnings that might be good to fix before merging this PR.
Also, I didn't check the implementation inside THAllocator.c.

torch/lib/TH/THAtomic.c

 {
 #if defined(USE_C11_ATOMICS)
  return atomic_fetch_add(a, value);
 #elif defined(USE_MSC_ATOMICS)
-  assert(sizeof(int) == sizeof(long));
-  return _InterlockedExchangeAdd((long*)a, value);
+  //assert(sizeof(int32_t) == sizeof(long));


torch/lib/TH/THAtomic.c

 {
 #if defined(USE_C11_ATOMICS)
  return atomic_compare_exchange_strong(a, &oldvalue, newvalue);
 #elif defined(USE_MSC_ATOMICS)
-  assert(sizeof(int) == sizeof(long));
-  return (_InterlockedCompareExchange((long*)a, (long)newvalue, (long)oldvalue) == (long)oldvalue);
+  //assert(sizeof(int32_t) == sizeof(long));


torch/lib/TH/THFile.c

+IMPLEMENT_THFILE_STORAGE(Char, int8_t)
+IMPLEMENT_THFILE_STORAGE(Short, int16_t)
+IMPLEMENT_THFILE_STORAGE(Int, int32_t)
+IMPLEMENT_THFILE_STORAGE(Long, int32_t)


torch/lib/TH/generic/THBlas.h

-TH_API void THBlas_(copy)(long n, real *x, long incx, real *y, long incy);
-TH_API void THBlas_(axpy)(long n, real a, real *x, long incx, real *y, long incy);
-TH_API real THBlas_(dot)(long n, real *x, long incx, real *y, long incy);
+TH_API void THBlas_(swap)(int64_t  n, real *x, int64_t  incx, real *y, int64_t  incy);


torch/lib/TH/generic/THTensor.c

@@ -922,7 +922,7 @@ THDescBuff THTensor_(desc)(const THTensor *tensor) {
  int i;
  for(i = 0; i < tensor->nDimension; i++) {
    if(n >= L) break;
-    n += snprintf(str+n, L-n, "%ld", tensor->size[i]);
+    n += snprintf(str+n, L-n, "%lld", tensor->size[i]);


torch/lib/TH/generic/THTensorRandom.c

      _q = THTensor_fastGet1d(q, rand_ind);

-      _mask = THRandom_bernoulli(_generator, _q);
+      _mask = (int) THRandom_bernoulli(_generator, _q);


torch/lib/TH/THDiskFile.c

@@ -556,7 +556,7 @@ static size_t THDiskFile_readString(THFile *self, const char *format, char **str
        total += TBRS_BSZ;
        p = THRealloc(p, total);
      }
-      if (fgets(p+pos, total-pos, dfself->handle) == NULL) /* eof? */
+      if (fgets(p+pos, (int) (total-pos), dfself->handle) == NULL) /* eof? */
      {
        if(pos == 0)


fmassa · 2017-08-17T15:45:37Z

Thanks for the changes!
TH seems now to compile without any warnings.
The build fails because of the dependency of THPP in TH, so we should probably only merge these PRs together.
@apaszke any better ideas on how we can run the tests with all the changes? The monolithic PR was too hard to review, the separate PRs are easier but running the full test suite is trickier.

peterjc123 · 2017-08-17T16:49:16Z

@fmassa I tried to make CI builds with windows-full branch. Every time a change is made, it will be merged into this branch. Maybe it's useful.
For Linux/Mac
For Windows

fmassa

Thanks a lot for your effort!
I think this is ready for merge. TH builds without warnings.
Let's wait until the other folders are reviewed so that we can merge them all.

torch/lib/TH/generic/THTensorRandom.c

 #elif defined(TH_REAL_IS_LONG)
-  TH_TENSOR_APPLY(real, self, *self_data = (long)(THRandom_random(_generator) % (LONG_MAX+1UL)););
+  TH_TENSOR_APPLY(real, self, *self_data = (int64_t)THRandom_random(_generator););


soumith · 2017-09-17T03:41:21Z

Thanks a ton @peterjc123 for doing this big PR. This is really good stuff.

…c39b3b (pytorch#30619) Summary: Pull Request resolved: pytorch#30619 Previous import was fea8568cac61a482ed208748fdc0e1a8e47f62f5 Included changes: - **[c08a7b76](onnx/onnx@c08a7b76)**: doc: fix some typos at ONNXIFI (pytorch#2473) <Yorkie Liu> - **[4be12d46](onnx/onnx@4be12d46)**: remove workshop update since it is done (pytorch#2460) <Prasanth Pulavarthi> - **[86107d1b](onnx/onnx@86107d1b)**: Updated with correct URL to LICENSE (pytorch#2468) <Ryan Loney> - **[9bf6fbb6](onnx/onnx@9bf6fbb6)**: Update Argmin/Argmax (pytorch#2461) <Lara Haidar> - **[748d81b8](onnx/onnx@748d81b8)**: Fix windows conda build (pytorch#2452) <Ashwini Khade> - **[a32db1c5](onnx/onnx@a32db1c5)**: Delete duplicate word in comment (pytorch#2439) <Haibo Hao> - **[e108da9a](onnx/onnx@e108da9a)**: Fix bug in function body verifier (pytorch#2390) <G. Ramalingam> - **[c3d3ef82](onnx/onnx@c3d3ef82)**: docs: fix typo in IR.md (pytorch#2441) <Elliot Waite> Test Plan: ci Reviewed By: hl475 Differential Revision: D18766132 fbshipit-source-id: f5767698c83ee7f0055f4cb87db9fb434c0dc9df

…c39b3b (#30619) Summary: Pull Request resolved: #30619 Previous import was fea8568cac61a482ed208748fdc0e1a8e47f62f5 Included changes: - **[c08a7b76](onnx/onnx@c08a7b76)**: doc: fix some typos at ONNXIFI (#2473) <Yorkie Liu> - **[4be12d46](onnx/onnx@4be12d46)**: remove workshop update since it is done (#2460) <Prasanth Pulavarthi> - **[86107d1b](onnx/onnx@86107d1b)**: Updated with correct URL to LICENSE (#2468) <Ryan Loney> - **[9bf6fbb6](onnx/onnx@9bf6fbb6)**: Update Argmin/Argmax (#2461) <Lara Haidar> - **[748d81b8](onnx/onnx@748d81b8)**: Fix windows conda build (#2452) <Ashwini Khade> - **[a32db1c5](onnx/onnx@a32db1c5)**: Delete duplicate word in comment (#2439) <Haibo Hao> - **[e108da9a](onnx/onnx@e108da9a)**: Fix bug in function body verifier (#2390) <G. Ramalingam> - **[c3d3ef82](onnx/onnx@c3d3ef82)**: docs: fix typo in IR.md (#2441) <Elliot Waite> Test Plan: ci Reviewed By: hl475 Differential Revision: D18766132 fbshipit-source-id: 13c04f21399579acb87a8f9fac2e4c329b0720b8

…c39b3b (pytorch#30619) Summary: Pull Request resolved: pytorch#30619 Previous import was fea8568cac61a482ed208748fdc0e1a8e47f62f5 Included changes: - **[c08a7b76](onnx/onnx@c08a7b76)**: doc: fix some typos at ONNXIFI (pytorch#2473) <Yorkie Liu> - **[4be12d46](onnx/onnx@4be12d46)**: remove workshop update since it is done (pytorch#2460) <Prasanth Pulavarthi> - **[86107d1b](onnx/onnx@86107d1b)**: Updated with correct URL to LICENSE (pytorch#2468) <Ryan Loney> - **[9bf6fbb6](onnx/onnx@9bf6fbb6)**: Update Argmin/Argmax (pytorch#2461) <Lara Haidar> - **[748d81b8](onnx/onnx@748d81b8)**: Fix windows conda build (pytorch#2452) <Ashwini Khade> - **[a32db1c5](onnx/onnx@a32db1c5)**: Delete duplicate word in comment (pytorch#2439) <Haibo Hao> - **[e108da9a](onnx/onnx@e108da9a)**: Fix bug in function body verifier (pytorch#2390) <G. Ramalingam> - **[c3d3ef82](onnx/onnx@c3d3ef82)**: docs: fix typo in IR.md (pytorch#2441) <Elliot Waite> Test Plan: ci Reviewed By: hl475 Differential Revision: D18766132 fbshipit-source-id: 13c04f21399579acb87a8f9fac2e4c329b0720b8

Win64 support for lib/TH

fa3926b

peterjc123 mentioned this pull request Aug 16, 2017

Add windows support please #494

Closed

fmassa requested changes Aug 16, 2017

View reviewed changes

peterjc123 added 2 commits August 17, 2017 13:49

Edit codes to clear warnings(for TH)

4a36e61

fix format string

fe023af

fmassa approved these changes Aug 18, 2017

View reviewed changes

revert modulo changes

7c6d904

soumith added this to Ready for Review in PR Status Aug 23, 2017

peterjc123 added 2 commits August 27, 2017 23:25

Merge branch 'master' into windows-TH

feb1cb9

change formats for snprintf

d07176e

fmassa mentioned this pull request Sep 12, 2017

distributed broadcast (gloo backend) does not work for any tensor type other than Float and Double #2699

Closed

Merge branch 'master' into windows-TH

4609829

soumith merged commit 61813cf into pytorch:master Sep 17, 2017

soumith removed this from Ready for Review in PR Status Sep 25, 2017

peterjc123 deleted the windows-TH branch September 27, 2017 02:15

ezyang added the open source label Jun 24, 2019

houseroad mentioned this pull request Dec 2, 2019

Automatic update of fbcode/onnx to c08a7b76cf7c1555ae37186f12be4d62b2c39b3b #30619

Closed

samnordmann pushed a commit to samnordmann/pytorch that referenced this pull request Mar 6, 2023

Fix cpAsyncCg (pytorch#2439)

4a95b24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve Windows Compatibility(for lib/TH) #2439

Improve Windows Compatibility(for lib/TH) #2439

peterjc123 commented Aug 16, 2017

fmassa left a comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

fmassa commented Aug 17, 2017

peterjc123 commented Aug 17, 2017 •

edited

fmassa left a comment

This comment was marked as off-topic.

soumith commented Sep 17, 2017

Improve Windows Compatibility(for lib/TH) #2439

Improve Windows Compatibility(for lib/TH) #2439

Conversation

peterjc123 commented Aug 16, 2017

fmassa left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

fmassa commented Aug 17, 2017

peterjc123 commented Aug 17, 2017 • edited

fmassa left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

soumith commented Sep 17, 2017

peterjc123 commented Aug 17, 2017 •

edited